gtkwindow: Do not show subsurface windows for hidden popover widgets

This is really just necessary when we have a visible widget, otherwise
the window would temporarily linger with odd size and surface.

https://bugzilla.gnome.org/show_bug.cgi?id=743427

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index ab96261e17edc7b8cdf78e02bed4be0f24f2361e..ba79229d6b25c35054ecda392910634f281dcd89 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -5948,16 +5948,12 @@ static void
 popover_map (GtkWidget        *widget,
              GtkWindowPopover *popover)
 {
-  if (popover->window)
+  if (popover->window && gtk_widget_get_visible (popover->widget))
     {
       gdk_window_show (popover->window);
-
-      if (gtk_widget_get_visible (popover->widget))
-        {
-          gtk_widget_map (popover->widget);
-          popover->unmap_id = g_signal_connect (popover->widget, "unmap",
-                                                G_CALLBACK (popover_unmap), popover);
-        }
+      gtk_widget_map (popover->widget);
+      popover->unmap_id = g_signal_connect (popover->widget, "unmap",
+                                            G_CALLBACK (popover_unmap), popover);
     }
 }